improved uptodate_index()