New build -- performance improvements for transitioned mode