Fixed sub-systems, but perturbers still not fully working