6th working vesion for Heroku