BFFW improved