updated currency logic
merged update currency