Working on heroku compliance