Implemented changes in BFL.