Addressing comments from yavorg