updated calculations
updated calculations
updated calculations