Changes by 01/04 9:10 AM + compatibility for Heroku