Refactored the blending system