- new (faster) index handling
