Perfromance improvements
Another wave of pefromance improvements