More changes to bip