Updated controller 2