#70 make types match up in Tool