S4

Taxonomy upgrade extras: