small changes to controller