improved event logic2