Updated controls for better idle behaviour