Optimized a bit more.