improved the forall tool