mid-fiddles update so i can merge with federico's