Change 'match' to an overridden method to keep new and old functionality

closes #1