updated calc and made factor