addressing Zhi's feedback