Update by Kai-Yi