Second working vesion for Heroku