Last updates
Modifies for heroku needs