updated calcfactors