Updated, now with case insensitive search