Update for Shangai :sunglasses: