More tweaks to the controller