made it work for production as well