added check for production as well