New: whole-word