Changing how this happens; heroku is freezing