Update from ffw-8