Better handling of single-step

But still needs improvement