update calculations based on soldo's feedback