More edits to BFD movement