datatransfer#18-xiquan->wangbo

add some improvement based on specific requirement