S3

Taxonomy upgrade extras: