Fixing Billy's tool