added yanqing's updates