We have to replace the fifo implementation with a Queue ...