Changes to initialization/event handling