Update for shanghai :ring: