Added some reporting logic