Improved performance on sample