S7

Taxonomy upgrade extras: