move fields around per review
Merge pull request #2 from Mrc2/130111

sync up with moved fields