Tightened logging