added name-index back in