Updated ControlSystem