SHF somewhat more coherent, still working on some tests yet