S8

Taxonomy upgrade extras: