Second commit on validation