revamp all bozza calculations
revamp all bozza calculations