next update with namespaces