update for through2

same great flavor, but updated for through2 and given a real test.