Moved some fields around