Worked on field handling