Addressing comments 2