Event triggering back in and improved