Fix for shooting
Fix for shooting, remove unused params
Resolve conflict