big update after development on heroku