combine with rongrong code because of his modify

combine with rongrong code because of his modify