Tools overhaul!