updated conversion formulas