Patrick's

Taxonomy upgrade extras: