Added reindexing