Better memory handling with events (just a little)