Updates to controller