Added comments. Changed call to indexer function, now calls
non-deprecated one.