More work on new tool mods.