Removed the --quit switch