Yesterday
Slightly optimise command reordering