responding to final feedback from andrei