Tweak for Shanghai :sparkles: