Validation re implemented