Part #2 of FX api change complete