merging from master dec 02