fixing up source for master merge