Optimized further.