Changes to Controller and View