Dan Comments

Updates Regarding Dan's Suggestions