NOREF: Tightening up the logic a little more