Refactored Stage