Incoporated changes for Names DB from existing site into this site