Added recordUserClick(), modified addToIndex()