add sender data check
Need to fix comments