Added client side calculator