updates to the way it handles shipping options