added untap events