Improvements to 10_SHOTS