FF fix pt2
FF fix pt3