Upgraded so that it can be moved off bamboo stack on heroku