Renamed some stuff, new index