S25

Taxonomy upgrade extras: