Edit is working with validation