FBWC improvement