Changed fifo buffers to hold multiple values.
Self-review