As the passing of Afeni Shakur draws an outpour of sadness, many questions have arisen regarding the status of her son’s estate. By good fortune however, it appears Afeni secured Tupac Shakur’s legacy with a trust to guard his music rights.

According to TMZ, Shakur took the necessary steps to set up control of all Tupac’s music and enlisted Tom Whalley, former head of Warner Bros. Records who also handled A&R direction for Me Against the World, as the executor of the trust.