SenderSwitch; Small adjustments