controller, added to a couple more files