Modified code in preparation of adding X,Y shot coordinates