Updated code to fix heroku area