Third working vesion for Heroku