Update PointerEvents with less wrapping