added check for service