Add step1 and step2 for init