Re-order tasks for improved demo flow