updating index with more enhancements