Stage refactoring
Stage refactoring