fix C4
fix B3
merge C4