code cleanup 1
fixed build
overlapping with shot simulation step one