Updated step-1