Add code for step2 & step3