PR2

Taxonomy upgrade extras: