Address zas comment