re-order and add the void back