Added (changes to) Controller class.
Minor changes to Controller class.