Fixed FX threading.
"some changes"