Added case insensitivity where needed