Added step2 and minor changes to other files