A large step towards making GeneralDistMatrix obsolete