Add yanyan's change