updated currency handling