Change Validation to RI