Fiddled a bit with the index