Changes for heroku(3)