changes to controller