Updated Code from Bridgewater