Improved history control.