Updated with more tools