Added --keep option