Overhaul of Aiming System