made calculation working...