GK 22

Taxonomy upgrade extras: