Better control system (Not complete)