Added clone step and consolidated step 7