added support for lowercase