update to using shipping address instead of origin