fixed for Heroku
Working on borrowing functionality