Add step2 and step3