Update for Shanghai :sunglasses: