Modify Handling

Add handling for previous fields