Improved performance, though it is currently taking 100% CPU.