updating for the v5 to v6 conversion