Reworked some step logic