First round of commenting for clarity