PR6

Taxonomy upgrade extras: