More BFSNeo work