add F18 support