clean
Correct linking
generateMass method