tweaked unitevent to point to right thing