Updated Shooter and Autonomous