changed endpoint service to support desired behavior