Small changes to controller