Initial Modification that works with my own heroku application