Updated to match by words instead