moved validator to index