added namespaces back to the mix