Rejigger indexing