First pass at BOF updates