Addressed commentts