some changes, CMD check ok