2.0 (Mikkel)
Calculate refactored
4.1