Reworked command. Added rerun option