Changes to CF handling. Still not quite right.