Slight rearrange to make future changes easier to do