major changes
refactored stage architecture