add validation for all fields