Updated to use word boundary.