added missing event handlers