ziye : #001 adjust structure again.