add echo and comments