Fixing Pingpong
Significant performance improvements