On the very same day that Kanye West and Wiz Khalifa got into their now infamous riff over the use of Harlem rapper Max B‘s patented “wavy” persona, sparked by Ye tentatively changing his album title to Waves, Miguel released the remix to his Wildheart standout, “Waves,” featuring Travi$ Scott. The well-timed release was followed by a music video just a couple weeks later, featuring Scott, who’s been busy working on new albums from Rihanna and Kanye West in the downtime since the release of his own LP, Rodeo, in September.

During a recent stop on Ellen Degeneres‘ extremely popular Ellen daytime spot, both Miguel and Travi$ performed the remix live for a delighted bunch of fans, and you can watch their performance above. If you haven’t heard Miguel’s Grammy-nominated Wildheart album yet, do yourself a favor.