New build -- major performance improvements