work from harbinger, added logging