sync with Tiantian 07-18