Improved Controller