Another place we should only calculate mass when we need it.