Added grading and multiple versions of token search for multiple tokens