move validation to the tools