updating with changes for v5 to v6 switch