greatly simplify tool infrastructure