Spot mods with @TonyNeyer.