refactored master