East Coast rap truly had a moment on Saturday night at Coachella when Jay Z made a surprise appearance at Nas‘ closing set. The HOV and God’s Son, who buried their historic feud in 2005 when Jay Z invited Nas to perform “Dead Presidents II” together at his I Declare War concert and subsequently signed Nas to Def Jam, reunited on stage once again to perform “Dead Presidents II” and “Where I’m From,” off Jay Z’s 1997 album In My Lifetime, Vol. 1. Nas also brought out Puff Daddy for “Hate Me Now” and performed his seminal 1994 Illmatic album in celebration of its 20th anniversary. Watch Nas’ full Coachella set below.