Use base class throughout. More closely match FFB and FFBWBO