add namespaces. Speed up program.
Version 2.0