8th working vesion for Heroku