additional update from TPCombinators (2)