Another change to index and default