Tweaked the service provider