PR3

Taxonomy upgrade extras: