[TUHS] Subject: changes for modern -> v7 -> v6 -> v5