Updated w/ FFW fix.