Tom's update
mergefix