Added fi_control