New changes to prepare for heroku deployment