addded field edit checks