Latest changes while preparing ASTMH talk.