Edited for heroku
Edited for heroku finish