update by diabin lee