slight tweak to controller