Modified index to include name and stuff