GK 21

Taxonomy upgrade extras: