Addressed Suggestions