Sender.h now works with new main/sender