Optimized for spree 2-1