Changed to work with heroku