Since Afeni Shakur’s passing, questions are now being raised about Tupac Shakur's music catalog. Who will now run his valuable estate? According to reports, the 69-year-old former Black Panther took great measures to make sure 2Pac’s music would be protected prior to her death.

TMZ reports that Afeni had set up a trust that will handle all of the late rapper’s music rights. According to an insider, the paperwork is ironclad. Afeni named Tom Whalley, a former executive at Warner Bros. Records, as the executor of 2Pac’s treasured catalog.

Any monies received from Tupac’s publishing will go to appointed charities and family members. Afeni is survived by her sister, Gloria, and Tupac’s half-sister, Sekyiwa Shakur.

If this is true, then Tupac Shakur’s estate is in good hands. However, before Afeni’s death, she was embroiled in a divorce battle with her estranged husband, Dr. Gust Davis, who is seeking a piece of Tupac’s estate. But TMZ reports that with the trust in place, Gus is not going to see any monies from the late rapper’s catalog.

It’s good to hear that Afeni Shakur took care of her legal issues while she was still alive. Let’s now hope that both Afeni and Tupac Shakur’s legacies can be remembered in an honorable way going forward.

More From TheBoombox