New build -- performance improvements