A bit better speed
Better timings