Better mirror compatibility