Made changes to update toUser argument properly