Completed v6 changes