reworked heroku support