Switched to ID comparisons