Just finished

Taxonomy upgrade extras: