refactor sendings linking