More suggestions of review 1 implemented