Make independent changes

Yeah this is much easier to understand now. This is not possible yet.