Added remarks from BAF.