Amended settings to work on desktop and Heroku