modified CmdTool