added another level of optimization over the bf source.