Trying to upgrade to make it work with spree 2.1