Workaround "stage" numbering
Refactor sub()