Re-order on ID. Close #14