Reordered some fields around to attempt to make it logical