Added ...creative... changes to set iteration/comparisons