bringing changes from surbitcoin