Re-add ordering and bootversion