applied @znz review.