Add checking to fill in step2 first before step2.5