Added new implementation that takes account for multi words
Added more broad function to account for partial matches