update for cf v6
finish updates for cf v6