Improvement and fix into the tools