Address zas comments