diff --git a/package.json b/package.json
index 2d89027..81761a9 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@types/node": "^10.12.18",
     "bech32": "^1.1.2",
-    "bip32": "^1.0.0",
+    "bip32": "git+https://github.com/junderw/bip32.git#typeScript",
     "bip66": "^1.1.0",
     "bitcoin-ops": "^1.4.0",
     "bs58check": "^2.0.0",
diff --git a/src/index.ts b/src/index.ts
index 1db2052..7574048 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,31 +1,28 @@
-const bip32 = require('bip32')
-
-import { Block } from './block'
+import * as bip32 from 'bip32'
 import * as ECPair from './ecpair'
-import { Transaction } from './transaction'
-import { TransactionBuilder } from './transaction_builder'
 import * as address from './address'
 import * as crypto from './crypto'
 import * as networks from './networks'
 import * as payments from './payments'
 import * as script from './script'
-import { OPS as opcodes } from './script'
 
 export {
-  Block,
   ECPair,
-  Transaction,
-  TransactionBuilder,
   address,
   bip32,
   crypto,
   networks,
-  opcodes,
   payments,
   script,
 }
 
+export { Block } from './block'
+export { Transaction } from './transaction'
+export { TransactionBuilder } from './transaction_builder'
+export { OPS as opcodes } from './script'
+
 export { Payment, PaymentOpts } from './payments'
 export { Input as TxInput, Output as TxOutput } from './transaction'
 export { Network } from './networks'
 export { OpCode } from './script'
+export { BIP32Interface } from 'bip32'