commit by jingwei Nov 2nd