Start using  env variable so that it works with herokku