Optimized further