Update 2.0b

Calculation update