Addressing Horia's issues raised in the review.