Added 26905 (plus some changes to accomodate this).