Reordered a few things