Minor Changes to Controllers