Added better autocomplete
Grades torify
Grades torify