Add data saving to single shot.

--BRJ and HP