updated reporting logic / clear trigger issue