More armor and tool work