changed the index names and things