B4 changes

still more