some changes to check tool