Updated CFW