Updated matching logic...