for merge with Xu Ye