Updated time indexing in class
Testing indexing