fixed lowercase / uppercase issue, defined new variables