added FMW support