updated files to mach changes done by rmerlin