tool flow + other changes