Addressed more points