moved a few fields around