Reordered some out of order stuff.