revert some bad changes and change kw name