refactored managers