calculation functionality updated