Updated, using newer text normalisation logic.