added functionlity for production env