integrating FF's changes