Changes in event handling mostly