Updated for latest Braid