Incorporate Kanwei's feedback