p1 patch (17 lines)