Updated to find and use mass.