[FOLD] Work on entry ordering