modified for testing on heroku
updated