Changes for Yaoyu's updates