namespace improved