removed the annoying namespace stuff