Reordered some stuff