Merging Tom's changes

Merging tom's changes