Working better, using namespaces