Pre patch indexing make over