Altered:
- Found some bugs in how indexing was done. Still didn't help.