hacked in FIFO support