partially addressing comments