Updated for latest braid