Updated CFish