Improve spot controller for heroku