added other v6 changes