tup-3.2 from wchen2 after commit