Optimized more of the tools