improved system with filtered data and correct triggers