Now does partial matching as well!