Minor changes to Controller