Hopefully my last set of changes to external BRD