fixing up mass conversion