also attempting to bring in working b field branch into master