updates with services
Merge branch 'huanchen'