moving to service
refactoring