minor changes to handle B1 by default