Changes so that there will be only one "distribution" and that works for positions and masses