Does the CFP need to change?