Temporarily removed Obs. to get local and heroku working