Lots of speedup, no new features added