restructured and partially merged CFP