Updating to use gobundle