Toolarmor redux!