Updating is only required on fail, but still it's slow
Rename heap to totalheap
More tooling