added send_queue
fixed merge conflicts