PR9

Taxonomy upgrade extras: