all updated and tested to be working on a new heroku deployment