[WIP] v6 changes