Update with Tophat memory fix.