Simplified changes to index