AFC 2

Taxonomy upgrade extras: