Moved fields around to make more sense