Combined the 2 files for the 2 controllers.