Some edits
VALIDATED