update and clean up after fields => Fields convention change