tom's changes
merging changes