More monitoring and removed the rupture filtering