Performance improvements. Outlier treatment improved