Updated Comments / Suggestions