Better history handling.