Still trying to fix heroku issues