Fine tune for heroku deployment