Improvements to controller