moving some fields around