Event handling changes and delay