fix and add b-form