p1269-70 plus some SullivansJohn missed previously