BTW can you also add some inline comment on when newStage could fail so we don't remove this in the future? Thanks!