Updated for shooting