take mass into account