Update for Shanghai :ring: