Updated controller and shooting code