Updated with PG for Heroku