Addressing comments from Aaron