Added flag for differentiating between tools