Improved handling of outliers