Progress on revised field handling