moved some fields around