merge from Tom