master bug fix
nothing
master bug fixed
B2 code complete