Changes based on issues raised at BRFA