Reorderd some more things