using new service
more fixes for new service