step-id now passed to steps through the context