more changes to controller