The non-fifo version is working!!!
Cleanup