Continued work on the index