Changed from tr1 to regular set. This change is still being tested