Add save buffering for 10x speedup