Getting rid of the horrible indexing system