James C - invariants now treat focus properly