Much better routing of steps