update after Xin Qian's comments