Continuing to integrate SFE's "newer" version

FFS