Reworked for latest Braid design