cleaning up, adding date field treatment