Final polishing of Autoscale