History completion improved