Reorder a few more functions