Improve performance to ~5M/sec.