Minor changes/pseudo merge of send script and custom script