New request order, minor fixes
Undo accidental type