refactored Team3373