Added --save option