additional update from TPCombinators