Significantly improved performance in some cases