first pass in fixing casing issue
Second pass in fixing casing issue