added F18 support