Updated for staging environment too