Rewrite to reflect the v1.0 upgrades