Add back in bcl checks