Some small changes to the Controller