Added a switch to skip one specified step