Tweaking completely to do case insensitive matching