Reverted to previous controller commit