untangle the CF specific stuff