Added changes to step 2