restored send function
yup
merge conflicts fixed