Address zas comments.