some desperte code changes to try fix heroku