updated for spree 2-4-stable