simplified codes
Merge branch 'shooting-issues'