MOre work on validation