update with Weiqi's commits