Pass on step1 (to be removed) and partial pass on step5 (to be finished)