Jesters hat

Taxonomy upgrade extras: