Add-on&Shipping upgrade

Add-on&Shipping upgrade