Brainstorm

Taxonomy upgrade extras: