added more weight conversions