Touch up on index