update according to Qihao input