Added currency calculations