Still working on Clarification and Edit validation