New file
Get indices correct