[206] Optimizations #2