changes to accomodate new namespacing modules.