Removed CFP + minor adjustments