Made FMI better