Fluid Math convertion - finished