Index and Log 3

Updates to index and log