refactored methods, changed 'fromUser' to 'sender' and changed to
'target'