Rework sending logic