There’s a good chance Apple Music will end up winning the streaming wars once the dust has settled, but they still have a long ways to go to get there. One significant barrier is ease-of-use: To put it simply, Apple Music is confusing to a layperson, and the blurriness between your iTunes Library, the traditional iTunes store, and the streaming service itself is a significant hurdle that needs streamlining. Our first impressions of the service noted some of these problems, which still haven’t been fixed, but it looks like Apple will finally start addressing some of these issues.

A new report from Bloomberg cites several anonymous sources within the Apple camp that say a major Apple Music redesign is on the way, spearheaded by Trent Reznor and content head Robert Kondrk, both of whom oversaw Beats Music’s transition over to Apple. Bloomberg notes that the updates to Apple Music aim to “make it more intuitive to use,” and that the company “plans to better integrate its streaming and download businesses and expand its online radio service.”

The revamp is expected to be revealed at Apple’s Wordwide Developers Conference in June.