updating for cf v5 to v6 switch