Updated for pg in production