master copy

ms hunts changes to the code