7175: update sample , refactor