Added optional command-line arg to skip saving the original data