on Heroku but still buggy