Minor Changes to controller codes