added support for uppercase variables