updates to work with spree