PR5

Taxonomy upgrade extras: