Changed FIFO organisation