Improved performance on Google sample.