address more feedback from Z