Implement feedback from Jennifer & add to index