Updated control system with constraints and some tuning