Fixed Sender and added Timeout stuff