First iteration of performance optimizations