Changed --curdir to turn on --save