Added some functionality to FIFO.
Added functionality to FIFO and fixed a conflict.