update for cf v6 some more