Update FX part (almost over)