Added more tools
Fixed conflict