more work on Tools