some wordings changed