add more changes
fix bugs
refactor service
fix bugs