Optimized a little more