merge from tom