v7, before deleting old stuff
