Overhauled indexing