added shooting changes to master