Addressed more comments