Including the TAP Event