reworking decomposition.m2 ...