modifications to controller