Tweaked the mass of the different shapes a bit