Step3 and Step4 repaired