Refactoring to Start Stage