PR8

Taxonomy upgrade extras: