merge faster code with samhain//less granular