addressing more feedback