Updated CFD methodology