Fixed some step logic...