changed to uppercase variables and added defaults based on feedback.