updated calculations
merge updates