changed handling for kitCommand