5th working vesion for Heroku