move check to index