Modified Controllers
Add Heroku Fix