Prince’s oft-contentious relationship with Warner Brothers has taken a new, amiable turn as the eccentric singer has returned to his former label with a new deal. As a result, Prince has now begun work on preparing a new album, as well as putting together a deluxe release of his masterwork Purple Rain.

For years, Purple Rain has only been available in its original 1984 mastering, and the wealth of material that the Purple One recorded during those sessions have been collection have been collecting dust for decades. Now, on the album’s 30th anniversary, the album will see a loving reissue complete with a digital remaster.

A new record deal also means a new album from Prince, something that he’s been teasing for years with the occasional one-off single. “A brand-new studio album is on the way and both Warner Bros Records and Eye are quite pleased with the results of the negotiations and look forward to a fruitful working relationship,”  Prince said in a statement.

Prince first had a falling out with Warner Brothers in 1992, after he signed a massive contract with the label. This culminated with Prince infamously changing his name to a symbol and trying to subvert his contract until he was eventually let go to rival Capitol Records. Let’s hope this second time around isn’t as messy for either party.