Improved controls