Mae final changes to b1

finished for now…