modernized some more subsystems