modify new shapes
compute correct masses