some slight changes to index