Moved CFP to the header