SFH added; header-only now