[V1S5 US21-23] : Refactoring + changed in reindexing.