Updated CFD2