FIFO handling added.