Change from lifo to fifo