Add degree heuristic
Before merging with conference version
Resolved version of conference