refactoring index / in progress add capsuler