Add step3 and step4 validation