7 modify by jerry
merge ...