New conversion algorithm, added more weight units.