Worked on the mass conversion issue