added F20, remove F16,17