Changed it to make it heroku friendly