pull in changes from Bridgewater