Redesign of Index