Modified all instances of general controller to reflect new context argument