refactored service and manager