Fixed the index and validator changes I messed up in class