add echo and fix data product issue