Improvements to 10_SHOTS
merge-fix