updated so it works with production services, not local