Change the switch statements again for Heroku.