Changed FX as optional