New Index file with bug fixes