web commit by simon: argh, horrible namespaces