Modified for load on heroku