added case insensitivity and spec