Addressed additional comments