repo with validator revised