Upgraded new descriptor to be essentially weighted form of Pmat