Wood-Mode Upgrades