Updated local vs remote delivery, and writing the fifo