Implemented result calculations
hotfix!