move NewIndex calls to SetUp