further index adaptations..