Add fdi and fdm back