make consistent ccfv and fem code