more edits for validation