Address most of reviewer 2's points