improve rx, tx part according to recommendation from yongari